`shrink-window' doc fix

* window.el (shrink-window): Mention the `window-min-height'
variable in the doc string.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ecc07fa709044a74222ccb5ef79e3c01eed555be..71b562534dcd0b319754d50c4962ccb22908f295 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * window.el (shrink-window): Mention the `window-min-height'
+       variable in the doc string.
+
 2012-04-05  Bastien Guerry  <bzg@altern.org>
 
        * color.el (color-lighten-name): Fix typo.

diff --git a/lisp/window.el b/lisp/window.el
index 42bc57272bb1f5597e3ff50515ceb527c6583c5e..c9e2469b0d28e66b1468524f331ba4baec918273 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2117,6 +2117,7 @@ Interactively, if no argument is given, make the selected window
 one line smaller.  If optional argument HORIZONTAL is non-nil,
 make selected window narrower by DELTA columns.  If DELTA is
 negative, enlarge selected window by -DELTA lines or columns.
+Also see the `window-min-height' variable.
 Return nil."
   (interactive "p")
   (cond